To: vim-dev@vim.org Subject: Patch 6.2f.008 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.2f.008 Problem: The Aap recipe doesn't work with Aap 0.149. Solution: Change targetarg to TARGETARG. Update the mysign file. Files: src/main.aap, src/mysign *** ../vim-6.2f.007/src/main.aap Mon May 26 22:15:06 2003 --- src/main.aap Tue May 27 10:27:09 2003 *************** *** 13,19 **** # Skip the configure stuff when "link.sh" is executing this recipe recursively # to build pathdef.c. ! @if _no.targetarg != "pathdef" and has_build_target(): # # A U T O C O N F --- 13,19 ---- # Skip the configure stuff when "link.sh" is executing this recipe recursively # to build pathdef.c. ! @if _no.TARGETARG != "pathdef" and has_build_target(): # # A U T O C O N F *************** *** 64,73 **** :touch {exist} config.arg # "auto/config.aap" contains a lot of settings, such as the name of the ! # executable "TARGET". # First update it, forcefully if the "reconfig" target was used. ! @if _no.targetarg != "comment" and _no.targetarg != "make": ! @if "reconfig" in var2list(_no.targetarg): :del {force} auto/config.cache auto/config.status :update {force} auto/config.aap @else: --- 64,73 ---- :touch {exist} config.arg # "auto/config.aap" contains a lot of settings, such as the name of the ! # executable "Target". # First update it, forcefully if the "reconfig" target was used. ! @if _no.TARGETARG != "comment" and _no.TARGETARG != "make": ! @if "reconfig" in var2list(_no.TARGETARG): :del {force} auto/config.cache auto/config.status :update {force} auto/config.aap @else: *************** *** 189,198 **** LDFLAGS = $ALL_LIB_DIRS $CONF_LDFLAGS LIBS = $GUI_LIBS1 $GUI_X_LIBS $GUI_LIBS2 $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS $CONF_LIBS $?(EXTRA_LIBS) $PERL_LIBS $PYTHON_LIBS $TCL_LIBS $RUBY_LIBS $?(PROFILE_LIBS) ! TARGET = $VIMNAME # reconfig target also builds Vim (reconfiguration is handled above). ! reconfig {virtual}: $TARGET # Execute the test scripts. Run these after compiling Vim, before installing. --- 189,198 ---- LDFLAGS = $ALL_LIB_DIRS $CONF_LDFLAGS LIBS = $GUI_LIBS1 $GUI_X_LIBS $GUI_LIBS2 $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS $CONF_LIBS $?(EXTRA_LIBS) $PERL_LIBS $PYTHON_LIBS $TCL_LIBS $RUBY_LIBS $?(PROFILE_LIBS) ! Target = $VIMNAME # reconfig target also builds Vim (reconfiguration is handled above). ! reconfig {virtual}: $Target # Execute the test scripts. Run these after compiling Vim, before installing. *************** *** 204,210 **** # If everything is allright, the final message will be "ALL DONE". # test check: ! VIMPROG = ../$TARGET :execute testdir/main.aap $GUI_TESTTARGET testclean {virtual}: --- 204,210 ---- # If everything is allright, the final message will be "ALL DONE". # test check: ! VIMPROG = ../$Target :execute testdir/main.aap $GUI_TESTTARGET testclean {virtual}: *************** *** 223,229 **** # All the source files that need to be compiled. # Some are optional and depend on configure. # "version.c" is missing, it's always compiled (see below). ! SOURCE = buffer.c charset.c diff.c --- 223,229 ---- # All the source files that need to be compiled. # Some are optional and depend on configure. # "version.c" is missing, it's always compiled (see below). ! Source = buffer.c charset.c diff.c *************** *** 279,299 **** # TODO: make is still used for subdirectories, need to write a recipe. MAKE ?= make ! all: $TARGET # This dependency is required to build auto/osdef.h before automatic # dependencies are generated. ! $SOURCE version.c : auto/osdef.h # Need to mention that the target also depends on version.c, since it's not ! # inluded in $SOURCE ! $TARGET : version.c # Some sources are to be found in the "auto" directory. SRCPATH += auto # When building Vim always compile version.c to get the timestamp. ! :attr {filetype = my_prog} $TARGET :action build my_prog object version_obj = `src2obj("version.c")` --- 279,301 ---- # TODO: make is still used for subdirectories, need to write a recipe. MAKE ?= make ! all: $Target # This dependency is required to build auto/osdef.h before automatic # dependencies are generated. ! $Source version.c : auto/osdef.h # Need to mention that the target also depends on version.c, since it's not ! # inluded in $Source ! $Target : version.c # Some sources are to be found in the "auto" directory. SRCPATH += auto # When building Vim always compile version.c to get the timestamp. ! :attr {filetype = my_prog} $Target ! ! :program $Target : $Source :action build my_prog object version_obj = `src2obj("version.c")` *************** *** 600,606 **** installvim {virtual}: installvimbin installruntime installlinks \ installhelplinks installmacros installtutor ! installvimbin {virtual}{force}: $TARGET $DEST_BIN exe = $DEST_BIN/$VIMTARGET @if os.path.exists(exe): # Move the old executable aside and delete it. Any other method --- 602,608 ---- installvim {virtual}: installvimbin installruntime installlinks \ installhelplinks installmacros installtutor ! installvimbin {virtual}{force}: $Target $DEST_BIN exe = $DEST_BIN/$VIMTARGET @if os.path.exists(exe): # Move the old executable aside and delete it. Any other method *** ../vim-6.2f.007/src/mysign Mon May 26 22:15:06 2003 --- src/mysign Tue May 27 19:38:27 2003 *************** *** 1 **** ! =auto/configure-lastupdate=1052392767.46=configure.in@md5=3d92588025cba0afd5c1a894c1a9fcff-@buildcheck=c7bb07412506d84ecec6b8e4c397d406 --- 1 ---- ! =auto/configure-lastupdate=1054056925.22=configure.in@md5=dda1fe31560c2b4300654fe6e96af738-@buildcheck=c7bb07412506d84ecec6b8e4c397d406 *** ../vim-6.2f.007/src/version.c Tue May 27 19:34:54 2003 --- src/version.c Tue May 27 21:18:05 2003 *************** *** 632,633 **** --- 632,635 ---- { /* Add new patch number below this line */ + /**/ + 8, /**/ -- For large projects, Team Leaders use sophisticated project management software to keep track of who's doing what. The software collects the lies and guesses of the project team and organizes them in to instantly outdated charts that are too boring to look at closely. This is called "planning". (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///