{"thread":{"id":"34055","subject":"[PATCH 0/2] Build fixes","startedAt":"2013-06-07T22:03:05Z","lastAt":"2013-06-07T23:12:17Z","messageCount":9,"participants":["Felipe Contreras","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"219745","messageId":"1370642587-32352-1-git-send-email-felipe.contreras@gmail.com","threadId":"34055","inReplyTo":null,"subject":"[PATCH 0/2] Build fixes","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-06-07T22:03:05Z","receivedAt":"2013-06-07T22:03:05Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Felipe Contreras (2):\n build: generate test scripts\n build: do not install git-remote-testgit\n\n Makefile | 8 +++++++-\n 1 file changed, 7 insertions(+), 1 deletion(-)\n\n-- \n1.8.3.698.g079b096\n"},{"id":"219747","messageId":"1370642587-32352-2-git-send-email-felipe.contreras@gmail.com","threadId":"34055","inReplyTo":"1370642587-32352-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 1/2] build: generate test scripts","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-06-07T22:03:06Z","receivedAt":"2013-06-07T22:03:06Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Commit 416fda6 (build: do not install git-remote-testpy) made it so\ngit-remote-testpy is not only not installed, but also not generated by\ndefault, let's make sure all the scripts are generated.\n\nSigned-off-by: Felipe Contreras \n---\n Makefile | 7 ++++++-\n 1 file changed, 6 insertions(+), 1 deletion(-)\n\ndiff --git a/Makefile b/Makefile\nindex 03524d0..126be01 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -531,6 +531,11 @@ SCRIPTS = $(SCRIPT_SH_INS) \\\n \t $(SCRIPT_PYTHON_INS) \\\n \t git-instaweb\n \n+SCRIPTS_GEN = $(SCRIPT_SH_GEN) \\\n+\t $(SCRIPT_PERL_GEN) \\\n+\t $(SCRIPT_PYTHON_GEN) \\\n+\t git-instaweb\n+\n ETAGS_TARGET = TAGS\n \n # Empty...\n@@ -1647,7 +1652,7 @@ all:: profile-clean\n endif\n endif\n \n-all:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS\n+all:: $(ALL_PROGRAMS) $(SCRIPTS_GEN) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS\n ifneq (,$X)\n \t$(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test -d '$p' -o '$p' -ef '$p$X' || $(RM) '$p';)\n endif\n-- \n1.8.3.698.g079b096\n"},{"id":"219748","messageId":"1370642587-32352-3-git-send-email-felipe.contreras@gmail.com","threadId":"34055","inReplyTo":"1370642587-32352-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 2/2] build: do not install git-remote-testgit","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-06-07T22:03:07Z","receivedAt":"2013-06-07T22:03:07Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n Makefile | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/Makefile b/Makefile\nindex 126be01..02e3d43 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -491,6 +491,7 @@ SCRIPT_PERL += git-svn.perl\n SCRIPT_PYTHON += git-remote-testpy.py\n SCRIPT_PYTHON += git-p4.py\n \n+NO_INSTALL += git-remote-testgit\n NO_INSTALL += git-remote-testpy\n \n # Generated files for scripts\n-- \n1.8.3.698.g079b096\n"},{"id":"219749","messageId":"CAMP44s1t7aqOorQqhXekZ5+DSZc8vjw+pP_bjLxki9F3bo5q1Q@mail.gmail.com","threadId":"34055","inReplyTo":"1370642587-32352-2-git-send-email-felipe.contreras@gmail.com","subject":"Re: [PATCH 1/2] build: generate test scripts","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-06-07T22:06:25Z","receivedAt":"2013-06-07T22:06:25Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Fri, Jun 7, 2013 at 5:03 PM, Felipe Contreras\n wrote:\n\n> -all:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS\n> +all:: $(ALL_PROGRAMS) $(SCRIPTS_GEN) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS\n\nAlternatively, we could add $(NO_INSTALL) here.\n\n-- \nFelipe Contreras\n"},{"id":"219755","messageId":"7v1u8dsghd.fsf@alter.siamese.dyndns.org","threadId":"34055","inReplyTo":"CAMP44s1t7aqOorQqhXekZ5+DSZc8vjw+pP_bjLxki9F3bo5q1Q@mail.gmail.com","subject":"Re: [PATCH 1/2] build: generate test scripts","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-07T22:28:30Z","receivedAt":"2013-06-07T22:28:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Contreras writes:\n\n> On Fri, Jun 7, 2013 at 5:03 PM, Felipe Contreras\n> wrote:\n>\n>> -all:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS\n>> +all:: $(ALL_PROGRAMS) $(SCRIPTS_GEN) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS\n>\n> Alternatively, we could add $(NO_INSTALL) here.\n\nAs ALL_PROGRAMS overlap with most of SCRIPTS_GEN, the above looks\noverly heavy-fisted. I tend to agree that a separate\n\n\tall:: $(NO_INSTALL)\n\nwould be much better, assuming that NO_INSTALL will mean \"We always\nwant to build these, but we never do not want to install them\"\nforever (which I am OK to assume).\n\nAlso\n\n\tmake clean\n make --test=5800 test\n\ndid not fail for me, and it turns out that \"clean\" somehow fails to\nclean git-remote-testpy script.\n\nAs git-remote-testpy is only for testing, another possibility is to\ndo\n\n -all:: $(TEST_PROGRAMS) $(test_bindir_programs)\n +all:: $(TEST_PROGRAMS) $(test_bindir_programs) git-remote-testpy\n\nbut I think $(NO_INSTALL) is the cleanest.\n\nPerhaps like this?\n\n Makefile | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/Makefile b/Makefile\nindex a748133..03fda50 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -2239,6 +2239,7 @@ endif\n \n test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))\n \n+all:: $(NO_INSTALL)\n all:: $(TEST_PROGRAMS) $(test_bindir_programs)\n \n bin-wrappers/%: wrap-for-bin.sh\n@@ -2489,7 +2490,7 @@ clean: profile-clean coverage-clean\n \t$(RM) *.o *.res block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \\\n \t\tbuiltin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)\n \t$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X\n-\t$(RM) $(TEST_PROGRAMS)\n+\t$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)\n \t$(RM) -r bin-wrappers $(dep_dirs)\n \t$(RM) -r po/build/\n \t$(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*\n"},{"id":"219759","messageId":"CAMP44s2N7AjpyK325FK5zWMnO4oausF3xiNmcfoqvNtxJ7DUEg@mail.gmail.com","threadId":"34055","inReplyTo":"7v1u8dsghd.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 1/2] build: generate test scripts","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-06-07T22:33:10Z","receivedAt":"2013-06-07T22:33:10Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Fri, Jun 7, 2013 at 5:28 PM, Junio C Hamano wrote:\n> Felipe Contreras writes:\n>\n>> On Fri, Jun 7, 2013 at 5:03 PM, Felipe Contreras\n>> wrote:\n>>\n>>> -all:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS\n>>> +all:: $(ALL_PROGRAMS) $(SCRIPTS_GEN) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS\n>>\n>> Alternatively, we could add $(NO_INSTALL) here.\n>\n> As ALL_PROGRAMS overlap with most of SCRIPTS_GEN, the above looks\n> overly heavy-fisted. I tend to agree that a separate\n>\n> all:: $(NO_INSTALL)\n>\n> would be much better, assuming that NO_INSTALL will mean \"We always\n> want to build these, but we never do not want to install them\"\n> forever (which I am OK to assume).\n>\n> Also\n>\n> make clean\n> make --test=5800 test\n>\n> did not fail for me, and it turns out that \"clean\" somehow fails to\n> clean git-remote-testpy script.\n>\n> As git-remote-testpy is only for testing, another possibility is to\n> do\n>\n> -all:: $(TEST_PROGRAMS) $(test_bindir_programs)\n> +all:: $(TEST_PROGRAMS) $(test_bindir_programs) git-remote-testpy\n>\n> but I think $(NO_INSTALL) is the cleanest.\n>\n> Perhaps like this?\n>\n> Makefile | 3 ++-\n> 1 file changed, 2 insertions(+), 1 deletion(-)\n>\n> diff --git a/Makefile b/Makefile\n> index a748133..03fda50 100644\n> --- a/Makefile\n> +++ b/Makefile\n> @@ -2239,6 +2239,7 @@ endif\n>\n> test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))\n>\n> +all:: $(NO_INSTALL)\n> all:: $(TEST_PROGRAMS) $(test_bindir_programs)\n>\n> bin-wrappers/%: wrap-for-bin.sh\n> @@ -2489,7 +2490,7 @@ clean: profile-clean coverage-clean\n> $(RM) *.o *.res block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \\\n> builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)\n> $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X\n> - $(RM) $(TEST_PROGRAMS)\n> + $(RM) $(TEST_PROGRAMS) $(NO_INSTALL)\n> $(RM) -r bin-wrappers $(dep_dirs)\n> $(RM) -r po/build/\n> $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*\n\nLooks good to me.\n\n-- \nFelipe Contreras\n"},{"id":"219760","messageId":"7vtxl9r1df.fsf@alter.siamese.dyndns.org","threadId":"34055","inReplyTo":"CAMP44s2N7AjpyK325FK5zWMnO4oausF3xiNmcfoqvNtxJ7DUEg@mail.gmail.com","subject":"Re: [PATCH 1/2] build: generate test scripts","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-07T22:40:12Z","receivedAt":"2013-06-07T22:40:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Contreras writes:\n\n>> Perhaps like this?\n>>\n>> Makefile | 3 ++-\n>> 1 file changed, 2 insertions(+), 1 deletion(-)\n>>\n>> diff --git a/Makefile b/Makefile\n>> index a748133..03fda50 100644\n>> --- a/Makefile\n>> +++ b/Makefile\n>> @@ -2239,6 +2239,7 @@ endif\n>>\n>> test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))\n>>\n>> +all:: $(NO_INSTALL)\n>> all:: $(TEST_PROGRAMS) $(test_bindir_programs)\n>>\n>> bin-wrappers/%: wrap-for-bin.sh\n>> @@ -2489,7 +2490,7 @@ clean: profile-clean coverage-clean\n>> $(RM) *.o *.res block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \\\n>> builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)\n>> $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X\n>> - $(RM) $(TEST_PROGRAMS)\n>> + $(RM) $(TEST_PROGRAMS) $(NO_INSTALL)\n>> $(RM) -r bin-wrappers $(dep_dirs)\n>> $(RM) -r po/build/\n>> $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*\n>\n> Looks good to me.\n\nActually the above would not work well. This is because...\n\n>> ..., assuming that NO_INSTALL will mean \"We always\n>> want to build these, but we never do not want to install them\"\n>> forever (which I am OK to assume).\n\n... the assumption does *not* hold already with git-remote-testgit,\nwhich is (or will be with patch 2/2) NO_INSTALL and we do not want\nto install it, but it is not built, hence we do not want to remove\nit, either.\n"},{"id":"219761","messageId":"CAMP44s3doQe2PTGSbZ7Afi9DNDGstN4VJAompeLxUjn4Cg=g2Q@mail.gmail.com","threadId":"34055","inReplyTo":"7vtxl9r1df.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 1/2] build: generate test scripts","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-06-07T22:43:43Z","receivedAt":"2013-06-07T22:43:43Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Fri, Jun 7, 2013 at 5:40 PM, Junio C Hamano wrote:\n> Felipe Contreras writes:\n>\n>>> Perhaps like this?\n>>>\n>>> Makefile | 3 ++-\n>>> 1 file changed, 2 insertions(+), 1 deletion(-)\n>>>\n>>> diff --git a/Makefile b/Makefile\n>>> index a748133..03fda50 100644\n>>> --- a/Makefile\n>>> +++ b/Makefile\n>>> @@ -2239,6 +2239,7 @@ endif\n>>>\n>>> test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $(BINDIR_PROGRAMS_NO_X) $(TEST_PROGRAMS_NEED_X))\n>>>\n>>> +all:: $(NO_INSTALL)\n>>> all:: $(TEST_PROGRAMS) $(test_bindir_programs)\n>>>\n>>> bin-wrappers/%: wrap-for-bin.sh\n>>> @@ -2489,7 +2490,7 @@ clean: profile-clean coverage-clean\n>>> $(RM) *.o *.res block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \\\n>>> builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)\n>>> $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X\n>>> - $(RM) $(TEST_PROGRAMS)\n>>> + $(RM) $(TEST_PROGRAMS) $(NO_INSTALL)\n>>> $(RM) -r bin-wrappers $(dep_dirs)\n>>> $(RM) -r po/build/\n>>> $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope*\n>>\n>> Looks good to me.\n>\n> Actually the above would not work well. This is because...\n>\n>>> ..., assuming that NO_INSTALL will mean \"We always\n>>> want to build these, but we never do not want to install them\"\n>>> forever (which I am OK to assume).\n>\n> ... the assumption does *not* hold already with git-remote-testgit,\n> which is (or will be with patch 2/2) NO_INSTALL and we do not want\n> to install it, but it is not built, hence we do not want to remove\n> it, either.\n\nIt is generated, in next. If it's not generated, there's no need to\nadd it to NO_INSTALL.\n\n-- \nFelipe Contreras\n"},{"id":"219764","messageId":"7vobbhqzvy.fsf@alter.siamese.dyndns.org","threadId":"34055","inReplyTo":"CAMP44s3doQe2PTGSbZ7Afi9DNDGstN4VJAompeLxUjn4Cg=g2Q@mail.gmail.com","subject":"Re: [PATCH 1/2] build: generate test scripts","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-07T23:12:17Z","receivedAt":"2013-06-07T23:12:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Contreras writes:\n\n> It is generated, in next. If it's not generated, there's no need to\n> add it to NO_INSTALL.\n\nOK, that makes sense.\nThanks.\n"}]}