Change in vdsm[master]: Compile python files using automake

[Federico Simoncelli]

Federico Simoncelli has uploaded a new change for review.

Change subject: Compile python files using automake
......................................................................

Compile python files using automake

In this patch:
* Use the PYTHON macro to compile python files
* Remove the redhat-rpm-config build dependency
* Move the vdsm sos plugin into its own directory to avoid the custom
  file renaming and to use the PYTHON macro
* Update the gitignore file and the copyright in the touched files
* Add the all-local target to force the substitutions in the python
  files

Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
---
M .gitignore
M configure.ac
M vds_bootstrap/Makefile.am
M vdsm.spec.in
M vdsm/Makefile.am
A vdsm/sos/Makefile.am
R vdsm/sos/vdsm.py.in
M vdsm/storage/Makefile.am
M vdsm_cli/Makefile.am
M vdsm_reg/Makefile.am
10 files changed, 179 insertions(+), 58 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/708/1
--
To view, visit http://gerrit.ovirt.org/708
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: Compile python files using automake
......................................................................


Patch Set 1: Verified

--
To view, visit http://gerrit.ovirt.org/708
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: Compile python files using automake
......................................................................


Patch Set 3: Verified

--
To view, visit http://gerrit.ovirt.org/708
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: Compile python files using automake
......................................................................


Patch Set 4: Verified

--
To view, visit http://gerrit.ovirt.org/708
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Compile python files using automake
......................................................................


Patch Set 4:

what's the motivation of using the PYTHON am macro? Portability?

--
To view, visit http://gerrit.ovirt.org/708
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: Compile python files using automake
......................................................................


Patch Set 6: Verified

--
To view, visit http://gerrit.ovirt.org/708
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: Compile python files using automake
......................................................................


Patch Set 6:

>  what's the motivation of using the PYTHON am macro? Portability?
It all started with portability (and to remove the redhat-rpm-config dependency
from the spec file so that Fedora is happy) and then I found several mistakes and
I squashed the fixes in.
For example persist-vdsm-hooks was listed as dist (even if it's generated from a
.in file) and it was missing from the gitignore file. 
Moreover, did you notice that if you were modifying an .in file the resulting file
wasn't getting regenerated when issuing a make? That is fixed now (with SUFFIXES:
.in and %: %.in).
I also grouped the sed replacements in one makefile (build-aux/Makefile.subs) to
avoid duplication. And several other small things.

A quick way to verify is:

 1) Check that the tar.gz (make distcheck) doesn't ship any file that should be
generated
 2) Check that all the macros are replaced in the installed files

--
To view, visit http://gerrit.ovirt.org/708
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Compile python files using automake
......................................................................


Patch Set 6: Looks good to me, approved

(1 inline comment)

thanks, Federico, I would never could have done this cleanup myself.

....................................................
File vdsm/sos/vdsm.py.in
Line 2: # Copyright 2008-2011 Red Hat, Inc.
heh, it's 2012 by now ;-)

--
To view, visit http://gerrit.ovirt.org/708
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: Compile python files using automake
......................................................................


Compile python files using automake

In this patch:
* Use the PYTHON macro to compile python files
* Remove the redhat-rpm-config build dependency
* Move the vdsm sos plugin into its own directory to avoid the custom
  file renaming and to use the PYTHON macro
* Update the gitignore file and the copyright in the touched files
* Add the all-local target to force the substitutions in the python
  files
* Unify the macro substitution in build-aux/Makefile.subs

Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
---
M .gitignore
A build-aux/Makefile.subs
M configure.ac
M vds_bootstrap/Makefile.am
M vdsm.spec.in
M vdsm/Makefile.am
A vdsm/sos/Makefile.am
R vdsm/sos/vdsm.py.in
M vdsm/storage/Makefile.am
M vdsm_cli/Makefile.am
M vdsm_hooks/Makefile.am
M vdsm_reg/Makefile.am
12 files changed, 261 insertions(+), 136 deletions(-)

Approvals:
  Federico Simoncelli: Verified
  Dan Kenigsberg: Looks good to me, approved


--
To view, visit http://gerrit.ovirt.org/708
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: Compile python files using automake
......................................................................


Patch Set 6:

Hi, 

First of all, thanks Federico for the fixes that you made, I am referring to my previous
ovirt patches.

Your patches indeed are good. However, if a non-root executes 'make distcheck' it
turns the error below. Is it expected by 'make distcheck'? (Sorry the delay to
review here)


/bin/mkdir -p /rhev/data-center
/bin/mkdir: cannot create directory `/rhev/data-center': Permission denied
make[4]: *** [install-data-local] Error 1
make[4]: Leaving directory `/home/vdsmdevel/xx/vdsm/vdsm-4.9.2/_build/vdsm'
make[3]: *** [install-am] Error 2
make[3]: Leaving directory `/home/vdsmdevel/xx/vdsm/vdsm-4.9.2/_build/vdsm'
make[2]: *** [install-recursive] Error 1
make[2]: Leaving directory `/home/vdsmdevel/xx/vdsm/vdsm-4.9.2/_build/vdsm'
make[1]: *** [install-recursive] Error 1
make[1]: Leaving directory `/home/vdsmdevel/xx/vdsm/vdsm-4.9.2/_build'
make: *** [distcheck] Error 1

--
To view, visit http://gerrit.ovirt.org/708
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

[Federico Simoncelli]

Federico Simoncelli has posted comments on this change.

Change subject: Compile python files using automake
......................................................................


Patch Set 6:

>  Your patches indeed are good. However, if a non-root executes
> 'make distcheck' it turns the error below. Is it expected by 'make
> distcheck'? (Sorry the delay to review here) 
My local build cycle always uses a non-root user. I can't reproduce the error, did you
clean your repo?

--
To view, visit http://gerrit.ovirt.org/708
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;

[Douglas Schilling Landgraf]

Douglas Schilling Landgraf has posted comments on this change.

Change subject: Compile python files using automake
......................................................................


Patch Set 6:

I have cloned again the vdsm repo and executed:
./autogen --system
make distcheck

the same error. I do believe you already have  in your local filesystem /rhev/data-center
directory, that's why you might not see it.

--
To view, visit http://gerrit.ovirt.org/708
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7dce5c317605b84ec883feb04bfc83c5f64d921b
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland(a)redhat.com&gt;
Gerrit-Reviewer: Federico Simoncelli <fsimonce(a)redhat.com&gt;