- updated

Changed files:
    bakefile-empy.patch -> 1.3

diff --git a/bakefile-empy.patch b/bakefile-empy.patch
index 0fb2bd8041c256dd88965e9b56be59d2e05f3771..9fe7f2c96445d152f4dbada3030ac76f2fee71d0 100644 (file)
--- a/bakefile-empy.patch
+++ b/bakefile-empy.patch
@@ -28,7 +28,7 @@
  # =========================================================================
  @{HeaderIncluded=1}@
 -]@
-+@[end if]
++@[end if]@
 --- bakefile-0.1.1.20030922/output/autoconf-macros.empy.wiget  2003-08-09 12:55:54.000000000 +0200
 +++ bakefile-0.1.1.20030922/output/autoconf-macros.empy        2003-09-22 16:29:11.000000000 +0200
 @@ -2,18 +2,18 @@
@@ -36,16 +36,16 @@
  dnl Do not modify, all changes will be overwritten!
  
 -@[ for check in AUTOCONF_CHECKS.split() :@
-+@[for check in AUTOCONF_CHECKS.split()]
++@[for check in AUTOCONF_CHECKS.split()]@
  dnl ### begin block 0_@check ###
  @check
 -]@
-+@[end for]
++@[end for]@
  
  dnl Conditions:
  
 -@[ for cond in conditions :@
-+@[for cond in conditions]
++@[for cond in conditions]@
  dnl ### begin block 1_COND_@cond.name ###
      COND_@cond.name="#"
      if test @utils.condition2string(cond, utils.CONDSTR_UNIXTEST) ; then
@@ -53,7 +53,7 @@
      fi
      AC_SUBST(COND_@cond.name)
 -]@
-+@[end for]
++@[end for]@
 --- bakefile-0.1.1.20030922/output/autoconf.empy.wiget 2003-07-26 21:57:22.000000000 +0200
 +++ bakefile-0.1.1.20030922/output/autoconf.empy       2003-09-22 16:29:11.000000000 +0200
 @@ -6,48 +6,48 @@
@@ -61,67 +61,67 @@
  normalOptions = [x for x in options if x.name not in specialOptions]
  }@
 -@[ for o in specialOptions :@
-+@[for o in specialOptions]
++@[for o in specialOptions]@
  @o = @@@o@@
 -]@
 -@[ for o in normalOptions :@
-+@[end for]
-+@[for o in normalOptions]
++@[end for]@
++@[for o in normalOptions]@
  @o.name = @@@o.name@@
 -]@
-+@[end for]
++@[end for]@
  
  ### Variables: ###
  
 -@[ for v in make_vars :@
-+@[for v in make_vars]
++@[for v in make_vars]@
  @utils.wrapLongLine('%s = ' % v.name, v.value, ' \\', variable=v.name)
 -]@
-+@[end for]
++@[end for]@
  
  ### Conditionally set variables: ###
  
 -@[ for c in cond_vars :@
 -@[ for v in c.values :@
 -@[if len(v.value) < 75:@
-+@[for c in cond_vars]
-+@[for v in c.values]
-+@[if len(v.value) < 75]
++@[for c in cond_vars]@
++@[for v in c.values]@
++@[if len(v.value) < 75]@
  @utils.wrapLongLine('@COND_%s@%s = ' % (v.cond.name, c.name), v.value, ' \\', indent='@COND_%s@\t' % v.cond.name, variable=v.cond.name)
 -]@
 -@[if len(v.value) >= 75:@
-+@[end if]
-+@[if len(v.value) >= 75]
++@[end if]@
++@[if len(v.value) >= 75]@
  @utils.wrapLongLine('COND_%s_%s = ' % (v.cond.name, c.name), v.value, ' \\', variable=c.name)
  @@COND_@v.cond.name@@@c.name = $(COND_@(v.cond.name)_@c.name)
 -]@
 -]@
 -]@
-+@[end if]
-+@[end for]
-+@[end for]
++@[end if]@
++@[end for]@
++@[end for]@
  
  ### Targets: ###
 -@[ for t in targets :
-+@[for t in targets]
++@[for t in targets]@
  @{
  if t.cond == None: condstr=''
  else: condstr='@COND_%s@' % t.cond.name
  }@
  @condstr@t.__targetdir@t.__targetname: @t.__deps
 -@[ for cmd in t.__command.splitlines():@
-+@[for cmd in t.__command.splitlines()]
++@[for cmd in t.__command.splitlines()]@
  @condstr@\t@cmd.strip()
 -]@
 -]@
-+@[end for]
-+@[end for]
++@[end for]@
++@[end for]@
  
 -@[ for f in fragments :
-+@[for f in fragments]
++@[for f in fragments]@
  @f.content
 -]@
-+@[end for]
++@[end for]@
  
  # Include dependency info, if present:
  @@IF_GNU_MAKE@@-include .deps/*.d
@@ -132,14 +132,14 @@
  # -------------------------------------------------------------------------
  
 -@[ for o in options :@
-+@[for o in options]
++@[for o in options]@
  # @o.descStr.replace('\n','\n# ') @o.valuesStr
  !ifndef @o.name
  @o.name = @o.defaultStr
  !endif
  
 -]@
-+@[end for]
++@[end for]@
 --- bakefile-0.1.1.20030922/output/borland.empy.wiget  2003-08-08 13:09:32.000000000 +0200
 +++ bakefile-0.1.1.20030922/output/borland.empy        2003-09-22 16:29:11.000000000 +0200
 @@ -3,11 +3,10 @@
@@ -149,11 +149,11 @@
 -@[if OPTIONS_FILE != '':!include @OPTIONS_FILE
 -]@
 -@[if OPTIONS_FILE == '':@
-+@[if OPTIONS_FILE != '']!include @OPTIONS_FILE@[end if]
-+@[if OPTIONS_FILE == '']
++@[if OPTIONS_FILE != '']!include @OPTIONS_FILE@[end if]@
++@[if OPTIONS_FILE == '']@
  @empy.include(os.path.join(RULESDIR, 'borland-opts.empy'))
 -]@
-+@[end if]
++@[end if]@
  
  # -------------------------------------------------------------------------
  # Do not modify the rest of this file!
@@ -162,24 +162,24 @@
  ### Variables: ###
  
 -@[ for v in make_vars :@
-+@[for v in make_vars]
++@[for v in make_vars]@
  @utils.wrapLongLine('%s = ' % v.name, v.value, ' \\', variable=v.name)
 -]@
-+@[end for]
++@[end for]@
  
  ### Conditionally set variables: ###
  
 -@[ for c in cond_vars :@
 -@[ for v in c.values :@
-+@[for c in cond_vars]
-+@[for v in c.values]
++@[for c in cond_vars]@
++@[for v in c.values]@
  !if @utils.condition2string(v.cond, utils.CONDSTR_MSVC)
  @utils.wrapLongLine('%s = ' % c.name, v.value, ' \\', variable=c.name)
  !endif
 -]@
 -]@
-+@[end for]
-+@[end for]
++@[end for]@
++@[end for]@
  
 -@[ if BUILDDIR != '.' :
 +@[if BUILDDIR != '.']
@@ -187,29 +187,29 @@
  @BUILDDIR:
  @\t-if not exist @BUILDDIR mkdir @BUILDDIR
 -]@
-+@[end if]
++@[end if]@
  
  ### Targets: ###
 -@[ for t in targets :
 -@[ if t.cond != None :@
-+@[for t in targets]
-+@[if t.cond != None]
++@[for t in targets]@
++@[if t.cond != None]@
  !if @utils.condition2string(t.cond, utils.CONDSTR_MSVC)
 -]@
-+@[end if]
++@[end if]@
  @t.__targetdir@t.__targetname: @t.__deps
 -@[ for cmd in t.__command.splitlines():@
-+@[for cmd in t.__command.splitlines()]
++@[for cmd in t.__command.splitlines()]@
  @(cmd.strip()=='|' ? '|' : '\t'+cmd.strip())
 -]@
 -@[ if t.cond != None :@
-+@[end for]
-+@[if t.cond != None]
++@[end for]@
++@[if t.cond != None]@
  !endif
 -]@
 -]@
-+@[end if]
-+@[end for]
++@[end if]@
++@[end for]@
 --- bakefile-0.1.1.20030922/output/mingw-opts.empy.wiget       2003-07-31 13:48:47.000000000 +0200
 +++ bakefile-0.1.1.20030922/output/mingw-opts.empy     2003-09-22 16:29:11.000000000 +0200
 @@ -4,8 +4,8 @@
@@ -217,12 +217,12 @@
  # -------------------------------------------------------------------------
  
 -@[ for o in options :@
-+@[for o in options]
++@[for o in options]@
  # @o.descStr.replace('\n','\n# ') @o.valuesStr
  @o.name = @o.defaultStr
  
 -]@
-+@[end for]
++@[end for]@
 --- bakefile-0.1.1.20030922/output/mingw.empy.wiget    2003-08-08 13:09:32.000000000 +0200
 +++ bakefile-0.1.1.20030922/output/mingw.empy  2003-09-22 16:29:11.000000000 +0200
 @@ -12,11 +12,11 @@
@@ -233,11 +233,11 @@
 -]@
 -@[if OPTIONS_FILE == '':@
 +@[if OPTIONS_FILE != '']include @OPTIONS_FILE
-+@[end if]
-+@[if OPTIONS_FILE == '']
++@[end if]@
++@[if OPTIONS_FILE == '']@
  @empy.include(os.path.join(RULESDIR, 'mingw-opts.empy'))
 -]@
-+@[end if]
++@[end if]@
  
  # -------------------------------------------------------------------------
  # Do not modify the rest of this file!
@@ -246,24 +246,24 @@
  ### Variables: ###
  
 -@[ for v in make_vars :@
-+@[for v in make_vars]
++@[for v in make_vars]@
  @utils.wrapLongLine('%s = ' % v.name, v.value, ' \\', variable=v.name)
 -]@
-+@[end for]
++@[end for]@
  
  ### Conditionally set variables: ###
  
 -@[ for c in cond_vars :@
 -@[ for v in c.values :@
-+@[for c in cond_vars]
-+@[for v in c.values]
++@[for c in cond_vars]@
++@[for v in c.values]@
  @makeCondBegin(v.cond)
  @utils.wrapLongLine('%s = ' % c.name, v.value, ' \\', variable=c.name)
  @makeCondEnd(v.cond)
 -]@
 -]@
-+@[end for]
-+@[end for]
++@[end for]@
++@[end for]@
  
 -@[ if BUILDDIR != '.' :
 +@[if BUILDDIR != '.']
@@ -271,7 +271,7 @@
  @BUILDDIR:
  @\t-if not exist @BUILDDIR mkdir @BUILDDIR
 -]@
-+@[end if]
++@[end if]@
  
  ### Targets: ###
 -@[ for t in targets :
@@ -279,19 +279,19 @@
 -]@
 +@[for t in targets]
 +@[if t.cond != None]makeCondBegin(t.cond)
-+@[end if]
++@[end if]@
  @t.__targetdir@t.__targetname: @t.__deps
 -@[ for cmd in t.__command.splitlines():@
-+@[for cmd in t.__command.splitlines()]
++@[for cmd in t.__command.splitlines()]@
  @(cmd.strip()=='|' ? '|' : '\t'+cmd.strip())
 -]@
 -@[ if t.cond != None :@makeCondEnd(t.cond)
 -]@
 -]@
-+@[end for]
++@[end for]@
 +@[if t.cond != None]makeCondEnd(t.cond)
-+@[end if]
-+@[end for]
++@[end if]@
++@[end for]@
  
  .PHONY: @(' '.join([t.__targetdir+t.__targetname for t in targets if t.__is_phony=='1']))
 --- bakefile-0.1.1.20030922/output/msvc-opts.empy.wiget        2003-07-31 13:48:47.000000000 +0200
@@ -301,12 +301,12 @@
  # -------------------------------------------------------------------------
  
 -@[ for o in options :@
-+@[for o in options]
++@[for o in options]@
  # @o.descStr.replace('\n','\n# ') @o.valuesStr
  @o.name = @o.defaultStr
  
 -]@
-+@[end for]
++@[end for]@
 --- bakefile-0.1.1.20030922/output/msvc.empy.wiget     2003-07-26 21:57:22.000000000 +0200
 +++ bakefile-0.1.1.20030922/output/msvc.empy   2003-09-22 16:29:11.000000000 +0200
 @@ -1,9 +1,9 @@
@@ -315,11 +315,11 @@
 -]@
 -@[if OPTIONS_FILE == '':@
 +@[if OPTIONS_FILE != '']!include <@OPTIONS_FILE>
-+@[end if]
-+@[if OPTIONS_FILE == '']
++@[end if]@
++@[if OPTIONS_FILE == '']@
  @empy.include(os.path.join(RULESDIR, 'watcom-opts.empy'))
 -]@
-+@[end if]
++@[end if]@
  
  # -------------------------------------------------------------------------
  # Do not modify the rest of this file!
@@ -328,24 +328,24 @@
  ### Variables: ###
  
 -@[ for v in make_vars :@
-+@[for v in make_vars]
++@[for v in make_vars]@
  @utils.wrapLongLine('%s = ' % v.name, v.value, ' \\', variable=v.name)
 -]@
-+@[end for]
++@[end for]@
  
  ### Conditionally set variables: ###
  
 -@[ for c in cond_vars :@
 -@[ for v in c.values :@
-+@[for c in cond_vars]
-+@[for v in c.values]
++@[for c in cond_vars]@
++@[for v in c.values]@
  !if @utils.condition2string(v.cond, utils.CONDSTR_MSVC)
  @utils.wrapLongLine('%s = ' % c.name, v.value, ' \\', variable=c.name)
  !endif
 -]@
 -]@
-+@[end for]
-+@[end for]
++@[end for]@
++@[end for]@
  
 -@[ if BUILDDIR != '.' :
 +@[if BUILDDIR != '.']
@@ -353,29 +353,29 @@
  @BUILDDIR:
  @\t-if not exist @BUILDDIR mkdir @BUILDDIR
 -]@
-+@[end if]
++@[end if]@
  
  ### Targets: ###
 -@[ for t in targets :
 -@[ if t.cond != None :@
 +@[for t in targets]
-+@[if t.cond != None]
++@[if t.cond != None]@
  !if @utils.condition2string(t.cond, utils.CONDSTR_MSVC)
 -]@
-+@[end if]
++@[end if]@
  @t.__targetdir@t.__targetname: @t.__deps
 -@[ for cmd in t.__command.splitlines():@
-+@[for cmd in t.__command.splitlines()]
++@[for cmd in t.__command.splitlines()]@
  @(cmd.strip()[:2]=='<<' ? '<<' : '\t'+cmd.strip())
 -]@
 -@[ if t.cond != None :@
-+@[end for]
-+@[if t.cond != None]
++@[end for]@
++@[if t.cond != None]@
  !endif
 -]@
 -]@
-+@[end if]
-+@[end for]
++@[end if]@
++@[end for]@
 --- bakefile-0.1.1.20030922/output/watcom-opts.empy.wiget      2003-07-31 13:48:47.000000000 +0200
 +++ bakefile-0.1.1.20030922/output/watcom-opts.empy    2003-09-22 16:29:11.000000000 +0200
 @@ -4,8 +4,8 @@
@@ -383,12 +383,12 @@
  # -------------------------------------------------------------------------
  
 -@[ for o in options :@
-+@[for o in options]
++@[for o in options]@
  # @o.descStr.replace('\n','\n# ') @o.valuesStr
  @o.name = @o.defaultStr
  
 -]@
-+@[end for]
++@[end for]@
 --- bakefile-0.1.1.20030922/output/watcom.empy.wiget   2003-08-08 13:09:32.000000000 +0200
 +++ bakefile-0.1.1.20030922/output/watcom.empy 2003-09-22 16:29:11.000000000 +0200
 @@ -12,11 +12,11 @@
@@ -399,11 +399,11 @@
 -]@
 -@[if OPTIONS_FILE == '':@
 +@[if OPTIONS_FILE != '']!include @OPTIONS_FILE
-+@[end if]
-+@[if OPTIONS_FILE == '']
++@[end if]@
++@[if OPTIONS_FILE == '']@
  @empy.include(os.path.join(RULESDIR, 'watcom-opts.empy'))
 -]@
-+@[end if]
++@[end if]@
  
  # -------------------------------------------------------------------------
  # Do not modify the rest of this file!
@@ -412,25 +412,25 @@
  ### Conditionally set variables: ###
  
 -@[ for c in cond_vars :@
-+@[for c in cond_vars]
++@[for c in cond_vars]@
  @c.name =
 -@[ for v in c.values :@
-+@[for v in c.values]
++@[for v in c.values]@
  @makeCondBegin(v.cond)
  @utils.wrapLongLine('%s = ' % c.name, v.value, ' &', variable=c.name)
  @makeCondEnd(v.cond)
 -]@
 -]@
-+@[end for]
-+@[end for]
++@[end for]@
++@[end for]@
  
  ### Variables: ###
  
 -@[ for v in make_vars :@
-+@[for v in make_vars]
++@[for v in make_vars]@
  @utils.wrapLongLine('%s = ' % v.name, v.value, ' &', variable=v.name)
 -]@
-+@[end for]
++@[end for]@
  
 -@[ if BUILDDIR != '.' :
 +@[if BUILDDIR != '.']
@@ -438,7 +438,7 @@
  @BUILDDIR :
  @\t-if not exist @BUILDDIR mkdir @BUILDDIR
 -]@
-+@[end if]
++@[end if]@
  
  ### Targets: ###
 -@[ for t in targets :
@@ -448,15 +448,15 @@
 -@[ for cmd in t.__command.splitlines():@
 +@[for t in targets]
 +@[if t.cond != None]makeCondBegin(t.cond)
-+@[end if]
++@[end if]@
 +@t.__targetdir@t.__targetname : @[if t.__is_phony=='1'].SYMBOLIC@[end if] @t.__deps
-+@[for cmd in t.__command.splitlines()]
++@[for cmd in t.__command.splitlines()]@
  @(cmd.strip()=='|' ? '|' : '\t'+cmd.strip())
 -]@
 -@[ if t.cond != None :@makeCondEnd(t.cond)
 -]@
 -]@
-+@[end for]
++@[end for]@
 +@[if t.cond != None]makeCondEnd(t.cond)
-+@[end if]
-+@[end for]
++@[end if]@
++@[end for]@