Skip to content

Ubuntu 16.04 build problem fixes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zoltan-ongithub wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Ubuntu 16.04 build problem fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72c4960
Fix URL for gmock
zoltan-ongithub Jan 20, 2017
5b44aec
Remove visited() method from URLDownload
zoltan-ongithub Jan 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions build_common/tools/URLDownload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,6 @@ def make_ready(self) :
except Exception, e :
raise SCons.Errors.StopError( '%s [%s]' % (e, self.value) )

def visited(self) :
ninfo = self.get_ninfo()

if self.url_etag :
ninfo.csig = self.url_etag
if self.url_last_modified :
ninfo.timestamp = self.url_last_modified
if self.url_content_length :
ninfo.size = self.url_content_length
SCons.Node.Node.visited(self);

def changed_since_last_build(self, target, prev_ni):
if prev_ni :
if self.url_etag :
Expand Down
2 changes: 1 addition & 1 deletion external/gmock/SConscript.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def dir_offset_from_current(subdir):

src_dir= 'gmock-1.7.0/'
tar_file = 'gmock-1.7.0.zip'
tar_url = 'https://googlemock.googlecode.com/files/gmock-1.7.0.zip'
tar_url = 'https://src.fedoraproject.org/repo/pkgs/gmock/gmock-1.7.0.zip/073b984d8798ea1594f5e44d85b20d66/gmock-1.7.0.zip'

if not os.path.exists(tar_file):
target_zip = gmock_env.URLDownload(tar_file, tar_url)
Expand Down