{"thread":{"id":"22345","subject":"[PATCH v2 1/4] engine.pl: Fix a recent breakage of the buildsystem generator","startedAt":"2010-01-22T20:00:47Z","lastAt":"2010-01-22T23:48:40Z","messageCount":2,"participants":["Ramsay Jones","Sebastian Schuberth"],"isPatch":true,"patchVersion":2,"patchTotal":4},"messages":[{"id":"132421","messageId":"4B5A03EF.1030208@ramsay1.demon.co.uk","threadId":"22345","inReplyTo":null,"subject":"[PATCH v2 1/4] engine.pl: Fix a recent breakage of the buildsystem generator","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2010-01-22T20:00:47Z","receivedAt":"2010-01-22T20:00:47Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nCommit ade2ca0c (Do not try to remove directories when removing\nold links, 27-10-2009) added an expression to a 'test' using an\n'-o' or connective. This resulted in the buildsystem generator\nmistaking a conditional 'rm' for a linker command. In order to\nfix the breakage, we filter out all 'test' commands before then\nattempting to identify the commands of interest.\n\nSigned-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\n---\n\nChanges from v1, in response to comments from Pete Harlan and\nSebastian Schuberth:\n\n    - remove second (useless) regex from condition in filter code\n    - remove the commented out version of the original filter code\n    - re-worded commit message to reflect the above changes\n\nATB,\nRamsay Jones\n\n contrib/buildsystems/engine.pl |    8 +++++---\n 1 files changed, 5 insertions(+), 3 deletions(-)\n\ndiff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl\nindex d506717..8f890fb 100644\n--- a/contrib/buildsystems/engine.pl\n+++ b/contrib/buildsystems/engine.pl\n@@ -135,6 +135,11 @@ sub parseMakeOutput\n             }\n         } while($ate_next);\n \n+        if ($text =~ /^test /) {\n+            # options to test (eg -o) may be mistaken for linker options\n+            next;\n+        }\n+\n         if($text =~ / -c /) {\n             # compilation\n             handleCompileLine($text, $line);\n@@ -180,9 +185,6 @@ sub parseMakeOutput\n #        } elsif ($text =~ /generate-cmdlist\\.sh/) {\n #            # command for generating list of commands\n #\n-#        } elsif ($text =~ /^test / && $text =~ /|| rm -f /) {\n-#            # commands removing executables, if they exist\n-#\n #        } elsif ($text =~ /new locations or Tcl/) {\n #            # command for detecting Tcl/Tk changes\n #\n-- \n1.6.6\n"},{"id":"132429","messageId":"4B5A3958.5060505@gmail.com","threadId":"22345","inReplyTo":"4B5A03EF.1030208@ramsay1.demon.co.uk","subject":"Re: [PATCH v2 1/4] engine.pl: Fix a recent breakage of the buildsystem generator","fromName":"Sebastian Schuberth","fromEmail":"sschuberth@gmail.com","sentAt":"2010-01-22T23:48:40Z","receivedAt":"2010-01-22T23:48:40Z","isPatch":true,"sender":{"key":"sschuberth@gmail.com","avatar":"https://avatars.githubusercontent.com/u/349154?v=4"},"body":"On 22.01.2010 21:00, Ramsay Jones wrote:\n\n> Commit ade2ca0c (Do not try to remove directories when removing\n> old links, 27-10-2009) added an expression to a 'test' using an\n> '-o' or connective. This resulted in the buildsystem generator\n> mistaking a conditional 'rm' for a linker command. In order to\n> fix the breakage, we filter out all 'test' commands before then\n> attempting to identify the commands of interest.\n>\n> Signed-off-by: Ramsay Jones<ramsay@ramsay1.demon.co.uk>\n> ---\n>\n> Changes from v1, in response to comments from Pete Harlan and\n> Sebastian Schuberth:\n>\n>      - remove second (useless) regex from condition in filter code\n>      - remove the commented out version of the original filter code\n>      - re-worded commit message to reflect the above changes\n\nAcked-by: Sebastian Schuberth <sschuberth@gmail.com>\n\nThanks again!\n\n-- \nSebastian Schuberth\n"}]}