]> git.pld-linux.org Git - packages/bakefile.git/blame - bakefile-empy.patch
projects / packages / bakefile.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- working version
[packages/bakefile.git] / bakefile-empy.patch
CommitLineData
6e7cce1b
AF		 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
3@@ -174,10 +174,13 @@
a02160c3
AF		 4 return (rulesdir, template)
5
6 def invoke_em(writer, file, method):
7- import empy.em
6e7cce1b
AF		 8+ try:
9+ import em
10+ except ImportError:
11+ from empy import em
a02160c3
AF		 12 rulesdir, template = __findWriter(writer)
13 filename = tempfile.mktemp('bakefile')
14- empy.em.invoke(['-I','mk',
15+ em.invoke(['-I','mk',
16 '-I','writer',
17 '-I','utils',
18 '-I','os,os.path',
6e7cce1b
AF		 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
21@@ -1,8 +1,8 @@
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 # =========================================================================
29 @{HeaderIncluded=1}@
30-]@
31+@[end if]
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
34@@ -2,18 +2,18 @@
35 dnl Bakefile @BAKEFILE_VERSION (http://bakefile.sourceforge.net)
36 dnl Do not modify, all changes will be overwritten!
37
38-@[ for check in AUTOCONF_CHECKS.split() :@
39+@[for check in AUTOCONF_CHECKS.split()]
40 dnl ### begin block 0_@check ###
41 @check
42-]@
43+@[end for]
44
45 dnl Conditions:
46
47-@[ for cond in conditions :@
48+@[for cond in conditions]
49 dnl ### begin block 1_COND_@cond.name ###
50 COND_@cond.name="#"
51 if test @utils.condition2string(cond, utils.CONDSTR_UNIXTEST) ; then
52 COND_@cond.name=""
53 fi
54 AC_SUBST(COND_@cond.name)
55-]@
56+@[end for]
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
59@@ -6,48 +6,48 @@
60 specialOptions = ['prefix', 'exec_prefix', 'INSTALL']
61 normalOptions = [x for x in options if x.name not in specialOptions]
62 }@
63-@[ for o in specialOptions :@
64+@[for o in specialOptions]
65 @o = @@@o@@
66-]@
67-@[ for o in normalOptions :@
68+@[end for]
69+@[for o in normalOptions]
70 @o.name = @@@o.name@@
71-]@
72+@[end for]
73
74 ### Variables: ###
75
76-@[ for v in make_vars :@
77+@[for v in make_vars]
78 @utils.wrapLongLine('%s = ' % v.name, v.value, ' \\', variable=v.name)
79-]@
80+@[end for]
81
82 ### Conditionally set variables: ###
83
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)
91-]@
92-@[if len(v.value) >= 75:@
93+@[end if]
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)
97-]@
98-]@
99-]@
100+@[end if]
101+@[end for]
102+@[end for]
103
104 ### Targets: ###
105-@[ for t in targets :
106+@[for t in targets]
107 @{
108 if t.cond == None: condstr=''
109 else: condstr='@COND_%s@' % t.cond.name
110 }@
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()
115-]@
116-]@
117+@[end for]
118+@[end for]
119
120-@[ for f in fragments :
121+@[for f in fragments]
122 @f.content
123-]@
124+@[end for]
125
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
130@@ -4,10 +4,10 @@
131 # These are configurable options:
132 # -------------------------------------------------------------------------
133
134-@[ for o in options :@
135+@[for o in options]
136 # @o.descStr.replace('\n','\n# ') @o.valuesStr
137 !ifndef @o.name
138 @o.name = @o.defaultStr
139 !endif
140
141-]@
142+@[end for]
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
145@@ -3,11 +3,10 @@
146 BCCDIR = $(MAKEDIR)\..
147 !endif
148
149-@[if OPTIONS_FILE != '':!include @OPTIONS_FILE
150-]@
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'))
155-]@
156+@[end if]
157
158 # -------------------------------------------------------------------------
159 # Do not modify the rest of this file!
160@@ -19,36 +18,36 @@
161
162 ### Variables: ###
163
164-@[ for v in make_vars :@
165+@[for v in make_vars]
166 @utils.wrapLongLine('%s = ' % v.name, v.value, ' \\', variable=v.name)
167-]@
168+@[end for]
169
170 ### Conditionally set variables: ###
171
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)
178 !endif
179-]@
180-]@
181+@[end for]
182+@[end for]
183
184-@[ if BUILDDIR != '.' :
185+@[if BUILDDIR != '.']
186 all: @BUILDDIR
187 @BUILDDIR:
188 @\t-if not exist @BUILDDIR mkdir @BUILDDIR
189-]@
190+@[end if]
191
192 ### Targets: ###
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)
198-]@
199+@[end if]
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())
204-]@
205-@[ if t.cond != None :@
206+@[end for]
207+@[if t.cond != None]
208 !endif
209-]@
210-]@
211+@[end if]
212+@[end for]
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
215@@ -4,8 +4,8 @@
216 # These are configurable options:
217 # -------------------------------------------------------------------------
218
219-@[ for o in options :@
220+@[for o in options]
221 # @o.descStr.replace('\n','\n# ') @o.valuesStr
222 @o.name = @o.defaultStr
223
224-]@
225+@[end for]
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
228@@ -12,11 +12,11 @@
229 return s.strip()
230 }@
231 @empy.include(os.path.join(RULESDIR, '_hdr_makefile.empy'))
232-@[if OPTIONS_FILE != '':include @OPTIONS_FILE
233-]@
234-@[if OPTIONS_FILE == '':@
235+@[if OPTIONS_FILE != '']include @OPTIONS_FILE
236+@[end if]
237+@[if OPTIONS_FILE == '']
238 @empy.include(os.path.join(RULESDIR, 'mingw-opts.empy'))
239-]@
240+@[end if]
241
242 # -------------------------------------------------------------------------
243 # Do not modify the rest of this file!
244@@ -24,36 +24,36 @@
245
246 ### Variables: ###
247
248-@[ for v in make_vars :@
249+@[for v in make_vars]
250 @utils.wrapLongLine('%s = ' % v.name, v.value, ' \\', variable=v.name)
251-]@
252+@[end for]
253
254 ### Conditionally set variables: ###
255
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)
262 @makeCondEnd(v.cond)
263-]@
264-]@
265+@[end for]
266+@[end for]
267
268-@[ if BUILDDIR != '.' :
269+@[if BUILDDIR != '.']
270 all: @BUILDDIR
271 @BUILDDIR:
272 @\t-if not exist @BUILDDIR mkdir @BUILDDIR
273-]@
274+@[end if]
275
276 ### Targets: ###
277-@[ for t in targets :
278-@[ if t.cond != None :@makeCondBegin(t.cond)
279-]@
280+@[for t in targets]
281+@[if t.cond != None]makeCondBegin(t.cond)
282+@[end if]
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())
287-]@
288-@[ if t.cond != None :@makeCondEnd(t.cond)
289-]@
290-]@
291+@[end for]
292+@[if t.cond != None]makeCondEnd(t.cond)
293+@[end if]
294+@[end for]
295
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
299@@ -4,8 +4,8 @@
300 # These are configurable options:
301 # -------------------------------------------------------------------------
302
303-@[ for o in options :@
304+@[for o in options]
305 # @o.descStr.replace('\n','\n# ') @o.valuesStr
306 @o.name = @o.defaultStr
307
308-]@
309+@[end for]
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
312@@ -1,9 +1,9 @@
313 @empy.include(os.path.join(RULESDIR, '_hdr_makefile.empy'))
314-@[if OPTIONS_FILE != '':!include <@OPTIONS_FILE>
315-]@
316-@[if OPTIONS_FILE == '':@
317+@[if OPTIONS_FILE != '']!include <@OPTIONS_FILE>
318+@[end if]
319+@[if OPTIONS_FILE == '']
320 @empy.include(os.path.join(RULESDIR, 'watcom-opts.empy'))
321-]@
322+@[end if]
323
324 # -------------------------------------------------------------------------
325 # Do not modify the rest of this file!
326@@ -11,36 +11,36 @@
327
328 ### Variables: ###
329
330-@[ for v in make_vars :@
331+@[for v in make_vars]
332 @utils.wrapLongLine('%s = ' % v.name, v.value, ' \\', variable=v.name)
333-]@
334+@[end for]
335
336 ### Conditionally set variables: ###
337
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)
344 !endif
345-]@
346-]@
347+@[end for]
348+@[end for]
349
350-@[ if BUILDDIR != '.' :
351+@[if BUILDDIR != '.']
352 all: @BUILDDIR
353 @BUILDDIR:
354 @\t-if not exist @BUILDDIR mkdir @BUILDDIR
355-]@
356+@[end if]
357
358 ### Targets: ###
359-@[ for t in targets :
360-@[ if t.cond != None :@
361+@[for t in targets]
362+@[if t.cond != None]
363 !if @utils.condition2string(t.cond, utils.CONDSTR_MSVC)
364-]@
365+@[end if]
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())
370-]@
371-@[ if t.cond != None :@
372+@[end for]
373+@[if t.cond != None]
374 !endif
375-]@
376-]@
377+@[end if]
378+@[end for]
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
381@@ -4,8 +4,8 @@
382 # These are configurable options:
383 # -------------------------------------------------------------------------
384
385-@[ for o in options :@
386+@[for o in options]
387 # @o.descStr.replace('\n','\n# ') @o.valuesStr
388 @o.name = @o.defaultStr
389
390-]@
391+@[end for]
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
394@@ -12,11 +12,11 @@
395 return s.strip()
396 }@
397 @empy.include(os.path.join(RULESDIR, '_hdr_makefile.empy'))
398-@[if OPTIONS_FILE != '':!include @OPTIONS_FILE
399-]@
400-@[if OPTIONS_FILE == '':@
401+@[if OPTIONS_FILE != '']!include @OPTIONS_FILE
402+@[end if]
403+@[if OPTIONS_FILE == '']
404 @empy.include(os.path.join(RULESDIR, 'watcom-opts.empy'))
405-]@
406+@[end if]
407
408 # -------------------------------------------------------------------------
409 # Do not modify the rest of this file!
410@@ -39,35 +39,35 @@
411
412 ### Conditionally set variables: ###
413
414-@[ for c in cond_vars :@
415+@[for c in cond_vars]
416 @c.name =
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)
421 @makeCondEnd(v.cond)
422-]@
423-]@
424+@[end for]
425+@[end for]
426
427 ### Variables: ###
428
429-@[ for v in make_vars :@
430+@[for v in make_vars]
431 @utils.wrapLongLine('%s = ' % v.name, v.value, ' &', variable=v.name)
432-]@
433+@[end for]
434
435-@[ if BUILDDIR != '.' :
436+@[if BUILDDIR != '.']
437 all : @BUILDDIR
438 @BUILDDIR :
439 @\t-if not exist @BUILDDIR mkdir @BUILDDIR
440-]@
441+@[end if]
442
443 ### Targets: ###
444-@[ for t in targets :
445-@[ if t.cond != None :@makeCondBegin(t.cond)
446-]@
447-@t.__targetdir@t.__targetname : @[if t.__is_phony=='1':.SYMBOLIC] @t.__deps
448-@[ for cmd in t.__command.splitlines():@
449+@[for t in targets]
450+@[if t.cond != None]makeCondBegin(t.cond)
451+@[end if]
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())
455-]@
456-@[ if t.cond != None :@makeCondEnd(t.cond)
457-]@
458-]@
459+@[end for]
460+@[if t.cond != None]makeCondEnd(t.cond)
461+@[end if]
462+@[end for]
Native makefiles generator
This page took 0.119185 seconds and 4 git commands to generate.