Modified: trunk/Tools/ChangeLog (171846 => 171847)
--- trunk/Tools/ChangeLog 2014-07-31 09:16:57 UTC (rev 171846)
+++ trunk/Tools/ChangeLog 2014-07-31 12:27:14 UTC (rev 171847)
@@ -1,5 +1,16 @@
2014-07-31 Carlos Garcia Campos <[email protected]>
+ [GTK] make distcheck is building from sources dir instead of dist dir
+ https://bugs.webkit.org/show_bug.cgi?id=135457
+
+ Reviewed by Philippe Normand.
+
+ * gtk/make-dist.py:
+ (Distcheck.configure): Use dist_dir as source dir.
+ (Distcheck.check): Pass dist_dir to configure().
+
+2014-07-31 Carlos Garcia Campos <[email protected]>
+
[GTK] Do not include files that are not in git in the tarball
https://bugs.webkit.org/show_bug.cgi?id=134804
Modified: trunk/Tools/gtk/make-dist.py (171846 => 171847)
--- trunk/Tools/gtk/make-dist.py 2014-07-31 09:16:57 UTC (rev 171846)
+++ trunk/Tools/gtk/make-dist.py 2014-07-31 12:27:14 UTC (rev 171847)
@@ -244,7 +244,7 @@
with closing(tarfile.open(tarball_path, 'r')) as tarball:
tarball.extractall(self.build_root)
- def configure(self, build_dir, install_dir):
+ def configure(self, dist_dir, build_dir, install_dir):
def create_dir(directory, directory_type):
try:
os.mkdir(directory)
@@ -255,7 +255,7 @@
create_dir(build_dir, "build")
create_dir(install_dir, "install")
- command = ['cmake', '-DPORT=GTK', '-DCMAKE_INSTALL_PREFIX=%s' % install_dir, '-DCMAKE_BUILD_TYPE=Release', self.source_root]
+ command = ['cmake', '-DPORT=GTK', '-DCMAKE_INSTALL_PREFIX=%s' % install_dir, '-DCMAKE_BUILD_TYPE=Release', dist_dir]
subprocess.check_call(command, cwd=build_dir)
def build(self, build_dir):
@@ -280,7 +280,7 @@
install_dir = os.path.join(dist_dir, self.INSTALL_DIRECTORY_NAME)
self.extract_tarball(tarball)
- self.configure(build_dir, install_dir)
+ self.configure(dist_dir, build_dir, install_dir)
self.build(build_dir)
self.install(build_dir)
self.clean(dist_dir)
